From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 1 Jul 2011 00:01:45 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~28
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9489390f05c26adecfeca89874d34ee0591a1dc9;p=emacs.git

Merge from trunk.
---

9489390f05c26adecfeca89874d34ee0591a1dc9